Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mcs: fix api wrongly send to scheduling server #7403

Merged
merged 5 commits into from
Nov 22, 2023
Merged

mcs: fix api wrongly send to scheduling server #7403

merged 5 commits into from
Nov 22, 2023

Conversation

rleungx
Copy link
Member

@rleungx rleungx commented Nov 21, 2023

What problem does this PR solve?

Issue Number: Ref #5839.

What is changed and how does it work?

Check List

Tests

  • Unit test

Release note

None.

@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Nov 21, 2023 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • disksing
  • lhy1024

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot bot added the release-note-none Denotes a PR that doesn't merit a release note. label Nov 21, 2023
@ti-chi-bot ti-chi-bot bot requested review from disksing and JmPotato November 21, 2023 07:15
@ti-chi-bot ti-chi-bot bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Nov 21, 2023
@ti-chi-bot ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 21, 2023
@rleungx
fix api wrongly send to scheduling server
4a669a4 
Signed-off-by: Ryan Leung <rleungx@gmail.com>
lhy1024
lhy1024 reviewed Nov 21, 2023
View reviewed changes
server/api/admin.go
@@ -61,7 +61,7 @@ func (h *adminHandler) DeleteRegionCache(w http.ResponseWriter, r *http.Request)
return
}
rc.DropCacheRegion(regionID)
if h.svr.IsAPIServiceMode() {
if h.svr.IsServiceIndependent(utils.SchedulingServiceName) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we also need to add judge in pkg/utils/apiutil/serverapi/middleware.go with h.s.IsServiceIndependent(rule.targetServiceName)
image

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have added it in #7297

@ti-chi-bot ti-chi-bot bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Nov 21, 2023
@lhy1024 lhy1024 mentioned this pull request Nov 21, 2023
Closed
25 tasks
@codecov Codecov
Copy link

codecov bot commented Nov 22, 2023 •
edited
Loading

Codecov Report

Merging #7403 (f3cb189) into master (fe84829) will increase coverage by 0.03%.
The diff coverage is 71.42%.

Additional details and impacted files 
@@            Coverage Diff             @@
##           master    #7403      +/-   ##
==========================================
+ Coverage   74.35%   74.39%   +0.03%     
==========================================
  Files         451      451              
  Lines       49386    49386              
==========================================
+ Hits        36723    36741      +18     
+ Misses       9414     9399      -15     
+ Partials     3249     3246       -3
Flag Coverage Δ
unittests 74.39% <71.42%> (+0.03%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

@rleungx
Copy link
Member Author

rleungx commented Nov 22, 2023

/merge

@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Nov 22, 2023

@rleungx: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and if the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

If you have any questions about the PR merge process, please refer to pr process.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Nov 22, 2023

This pull request has been accepted and is ready to merge.

Commit hash: 8ec5b7a

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 22, 2023
@ti-chi-bot ti-chi-bot bot merged commit c0dad35 into tikv:master Nov 22, 2023
22 of 23 checks passed
@rleungx rleungx deleted the fix-api branch November 22, 2023 10:09
@rleungx rleungx mentioned this pull request Nov 30, 2023
Closed
rleungx added a commit to rleungx/pd that referenced this pull request Dec 1, 2023
@rleungx @lhy1024 @ti-chi-bot
mcs: fix api wrongly send to scheduling server (tikv#7403)
aafcd16 
ref tikv#5839

Co-authored-by: lhy1024 <admin@liudos.us>
Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lhy1024 lhy1024 lhy1024 approved these changes

@disksing disksing disksing approved these changes

@JmPotato JmPotato Awaiting requested review from JmPotato

Assignees
No one assigned
Labels
release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@rleungx @disksing @lhy1024